Autogenerated HTML docs for v1.6.1-rc2-14-g5363d
diff --git a/git-merge-file.html b/git-merge-file.html index 9065e4e..51b7e00 100644 --- a/git-merge-file.html +++ b/git-merge-file.html
@@ -326,16 +326,16 @@ </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p><em>git-file-merge</em> incorporates all changes that lead from the <tt><base-file></tt> +<div class="para"><p><em>git-merge-file</em> incorporates all changes that lead from the <tt><base-file></tt> to <tt><other-file></tt> into <tt><current-file></tt>. The result ordinarily goes into <tt><current-file></tt>. <em>git-merge-file</em> is useful for combining separate changes to an original. Suppose <tt><base-file></tt> is the original, and both -<tt><current-file></tt> and <tt><other-file></tt> are modifications of <tt><base-file></tt>. -Then <em>git-merge-file</em> combines both changes.</p></div> +<tt><current-file></tt> and <tt><other-file></tt> are modifications of <tt><base-file></tt>, +then <em>git-merge-file</em> combines both changes.</p></div> <div class="para"><p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes in a common segment of lines. If a conflict is found, <em>git-merge-file</em> -normally outputs a warning and brackets the conflict with <<<<<<< and ->>>>>>> lines. A typical conflict will look like this:</p></div> +normally outputs a warning and brackets the conflict with lines containing +<<<<<<< and >>>>>>> markers. A typical conflict will look like this:</p></div> <div class="literalblock"> <div class="content"> <pre><tt><<<<<<< A @@ -382,7 +382,7 @@ </dt> <dd> <p> - Quiet; do not warn about conflicts. + Quiet; do not warn about conflicts. </p> </dd> </dl></div> @@ -425,7 +425,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:28:40 UTC +Last updated 2008-12-10 08:33:20 UTC </div> </div> </body>
